Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 28 Apr 2011 00:22:37 +0000 (17:22 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 28 Apr 2011 00:22:37 +0000 (17:22 -0700)

Trivial merge